Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / src / exceptions / OfferCanNotBeBooked.java

diff --git a/ruralHouses client/src/exceptions/OfferCanNotBeBooked.java b/ruralHouses client/src/exceptions/OfferCanNotBeBooked.java
new file mode 100644 (file)
index 0000000..b4539d0
--- /dev/null
+++ b/ruralHouses client/src/exceptions/OfferCanNotBeBooked.java
@@ -0,0 +1,17 @@
+package exceptions;
+public class OfferCanNotBeBooked extends Exception {
+       private static final long serialVersionUID = 1L;
+
+       public OfferCanNotBeBooked() {
+               super();
+       }
+       
+       /**This exception is triggered if an offer cannot be booked 
+        *@param String
+        *@return None
+        */
+       public OfferCanNotBeBooked(String s)
+       {
+               super(s);
+       }
+}
\ No newline at end of file